From dc80089047867297163f3fac3d27bc4b1a8798b9 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Thu, 18 Sep 2014 18:07:21 +0000 Subject: [PATCH] more use of qPrintable instead of CSTR or CSTRc with warning. --- gpsbabel/arcdist.cc | 2 +- gpsbabel/delbin.cc | 2 +- gpsbabel/exif.cc | 2 +- gpsbabel/gdb.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gpsbabel/arcdist.cc b/gpsbabel/arcdist.cc index 6a59b8250..d3916c66b 100644 --- a/gpsbabel/arcdist.cc +++ b/gpsbabel/arcdist.cc @@ -253,7 +253,7 @@ arcdist_process(void) } if (global_opts.debug_level >= 1) { warning("Including waypoint %s at dist:%f lat:%f lon:%f\n", - CSTRc(wp->shortname), ed->distance, wp->latitude, wp->longitude); + qPrintable(wp->shortname), ed->distance, wp->latitude, wp->longitude); } } xfree(ed); diff --git a/gpsbabel/delbin.cc b/gpsbabel/delbin.cc index 75628c7e7..64d301d58 100644 --- a/gpsbabel/delbin.cc +++ b/gpsbabel/delbin.cc @@ -1982,7 +1982,7 @@ read_route(route_head* route) wp_array = (Waypoint**) xcalloc(total, sizeof(*wp_array)); if (global_opts.debug_level >= DBGLVL_L) { warning(MYNAME ": route '%s' %u points, %u shape points\n", - CSTRc(route->rte_name), route_total, shape_total); + qPrintable(route->rte_name), route_total, shape_total); } message_free(&msg_array[0]); for (i = 1; i < msg_array_n; i++) { diff --git a/gpsbabel/exif.cc b/gpsbabel/exif.cc index 19a7110b9..26795b4ca 100644 --- a/gpsbabel/exif.cc +++ b/gpsbabel/exif.cc @@ -1455,7 +1455,7 @@ exif_write(void) if (exif_wpt_ref != NULL) { QString str = exif_time_str(exif_wpt_ref->creation_time.toTime_t()); warning(MYNAME ": Best is from %s, %d second(s) away.\n", - CSTR(str), abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())); + qPrintable(str), abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t())); } exif_wpt_ref = NULL; } diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc index f2b065825..c301a8900 100644 --- a/gpsbabel/gdb.cc +++ b/gpsbabel/gdb.cc @@ -389,7 +389,7 @@ gdb_add_route_waypt(route_head* rte, Waypoint* ref, const int wpt_class) if (fabs(dist) > 100) { warning(MYNAME ": Route point mismatch!\n"); warning(MYNAME ": \"%s\" from waypoints differs to \"%s\"\n", - CSTRc(tmp->shortname), CSTRc(ref->shortname)); + qPrintable(tmp->shortname), qPrintable(ref->shortname)); fatal(MYNAME ": from route table by more than %0.1f meters!\n", dist); -- 2.30.2